projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ec3768 613fef5)
bitkeeper revision 1.127 (3e720586O6aVrNSfBP-JoasaybnNsg)
authorrn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net>
Fri, 14 Mar 2003 16:38:30 +0000 (16:38 +0000)
committerrn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net>
Fri, 14 Mar 2003 16:38:30 +0000 (16:38 +0000)
I have no idea what this is merges of merges....

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/include/xeno/sched.h patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/include/xeno/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.